auto merge of #131 : alexcrichton/cargo/update-to-master, r=update
authorbors <bors@rust-lang.org>
Mon, 7 Jul 2014 13:28:45 +0000 (13:28 +0000)
committerbors <bors@rust-lang.org>
Mon, 7 Jul 2014 13:28:45 +0000 (13:28 +0000)
commite1c618b6ef1cca11a2604342639c36b41a597be0
treea656b9b44d0b33a20b417dbc8cf0e976281c4dfb
parentae1efeedf5aa62c32aa990224fad93f03e8705c8
parentc097d985ccd52e792054b3b8242c1c759f23ad3f
auto merge of #131 : alexcrichton/cargo/update-to-master, r=update